Merging in gradle-template, specifically provided #51
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wrong Sonatype URL - don't know why this wasn't found before
Conflicts: gradle/convention.gradle
Conflicts: .gitignore build.gradle gradle.properties gradle/buildscript.gradle gradle/convention.gradle settings.gradle
…rovided was done Conflicts: hystrix-contrib/hystrix-metrics-event-stream/build.gradle
benjchristensen
added a commit
that referenced
this pull request
Dec 14, 2012
Merging in gradle-template, specifically provided
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
29 of the commits are the backlog of gradle-template commits whose history was lost during the release of Hystrix, from the internal copy. This will put Hystrix back into line, from a git point of view, with gradle-template. They're all no-ops when looking at the "Files changed" tab. Future merges won't be this bad.
The last three are the ones which really count for "provided". 36e5b8f and da57e54 are the gradle-template versions of provided. a4662be is my fixes to Hystrix to use the gradle-template version, and to fix two missing dependencies that I found when provided was working correctly.
The reason for not using "compile.extendsFrom provided", is for ivy. Our ivy builds were having provided deps come through dependencies with that line. When generating with the POM, all provided things are thrown out the window, so issues won't crop up there.